From ccb4068bcf3701648d612ffdd786383be8064dae Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Tue, 31 Jan 2006 20:34:29 +0000
Subject: [PATCH] dnsmasq update fix #182

SVN-Revision: 3098
---
 openwrt/package/dnsmasq/Makefile              | 10 ++--
 .../package/dnsmasq/patches/100-config.patch  | 49 -------------------
 2 files changed, 5 insertions(+), 54 deletions(-)
 delete mode 100644 openwrt/package/dnsmasq/patches/100-config.patch

diff --git a/openwrt/package/dnsmasq/Makefile b/openwrt/package/dnsmasq/Makefile
index 73a9061353..cca02ccf42 100644
--- a/openwrt/package/dnsmasq/Makefile
+++ b/openwrt/package/dnsmasq/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
-PKG_VERSION:=2.22
-PKG_RELEASE:=2
-PKG_MD5SUM:=b38f33cd0703fa664a37a4595d918189
+PKG_VERSION:=2.26
+PKG_RELEASE:=1
+PKG_MD5SUM:=ae04abb5db4a8cc43c24f432f0c44d5c
 
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -27,10 +27,10 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_DNSMASQ):
 	install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin
-	cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/
-	$(STRIP) $(IDIR_DNSMASQ)/usr/sbin/*
+	cp -fpR $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/
 	install -d -m0755 $(IDIR_DNSMASQ)/etc/init.d/
 	install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf
 	install -m0755 ./files/S50dnsmasq $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq
+	$(RSTRIP) $(IDIR_DNSMASQ)
 	$(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR)
 
diff --git a/openwrt/package/dnsmasq/patches/100-config.patch b/openwrt/package/dnsmasq/patches/100-config.patch
deleted file mode 100644
index 270c22740e..0000000000
--- a/openwrt/package/dnsmasq/patches/100-config.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur dnsmasq-2.15.orig/src/config.h dnsmasq-2.15/src/config.h
---- dnsmasq-2.15.orig/src/config.h	2004-10-08 11:41:34.757371880 -0400
-+++ dnsmasq-2.15/src/config.h	2004-10-08 11:43:49.074952504 -0400
-@@ -78,6 +78,11 @@
- /* We assume that systems which don't have IPv6
-    headers don't have ntop and pton either */
- 
-+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)
-+#  undef NO_IPV6
-+#  define NO_IPV6
-+#endif
-+
- #if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6)
- #  define HAVE_IPV6
- #  define ADDRSTRLEN INET6_ADDRSTRLEN
-@@ -194,7 +199,7 @@
- /* platform dependent options. */
- 
- /* Must preceed __linux__ since uClinux defines __linux__ too. */
--#if defined(__uClinux__) || defined(__UCLIBC__)
-+#if defined(__uClinux__)
- #undef HAVE_LINUX_IPV6_PROC
- #define HAVE_GETOPT_LONG
- #undef HAVE_ARC4RANDOM
-@@ -208,6 +213,24 @@
- #  define NO_FORK
- #endif
- 
-+#elif defined(__linux__) && defined(__UCLIBC__)
-+#  define HAVE_LINUX_IPV6_PROC
-+#  if defined(__UCLIBC_HAS_GNU_GETOPT__) || \
-+   ((__UCLIBC_MAJOR__==0) && (__UCLIBC_MINOR__==9) && (__UCLIBC_SUBLEVEL__<21))
-+#    define HAVE_GETOPT_LONG
-+#  else
-+#    undef HAVE_GETOPT_LONG
-+#  endif
-+#undef HAVE_ARC4RANDOM
-+#define HAVE_RANDOM
-+#define HAVE_DEV_URANDOM
-+#define HAVE_DEV_RANDOM
-+#undef HAVE_SOCKADDR_SA_LEN
-+#undef HAVE_PSELECT
-+#if !defined(__ARCH_HAS_MMU__)
-+#  define NO_FORK
-+#endif
-+
- /* libc5 - must precede __linux__ too */
- /* Note to build a libc5 binary on a modern Debian system:
-    install the packages altgcc libc5 and libc5-altdev 
-- 
2.30.2